I don't think this should be git-specific, but available for any repository type. That would require keeping the synced files around (which is probably a good idea anyway) and using them to generate the diff. Maybe using something like https://github.com/java-diff-utils/java-diff-utils ?

@nevenz that is true, i should implement it for all repos, not just git, I myself don't use git 😅
Can anybody provide any mentoring on this? Right now I'm planning to do this:

1. Add function StoreBooks to SyncRepo interface and use it to download all remote books to some local folder
2. Find a place where the sync happens (working on this rn) and instead of syncing with remote, fetch the remote notebooks first and then sync them. If any merge conficts appear - show diff.

I don't think there's a need for changing the interface. As you suggest in #2, we can simply keep already used notebooks files around. See the creation and deletion of temporary files in loadBookFromRepo and saveBookToRepo.

@nevenz on latest upsteam/master I cannot sync with dropbox, only webdav and directory, am I doing something wrong?

on latest upsteam/master I cannot sync with dropbox, only webdav and directory, am I doing something wrong?

Check the build variant you're using. Perhaps it's one of the fdroid* ?

yup, that was the reason. Thanks!

This would be a really useful addition to the feature set. Syncing issues are very common when using dropbox integration, as sync has to be manually activated.

Looking forward to this merge.

damn, I don't remember closing this!

damn, I might have accidentally overwritten my master branch (who even does work on master, jeesh!)
Trying to work on it, living ALL THESE YEARS without diff is hard... Any help welcome!

+1
this feature would be most useful. thanks for working on this!